Initial refactor work

Merged Bitbucket Importer requested to merge bitbucket/merged-pr-57 into branch/bytearray-refactor