Cleanup package structure

Some preparations for future extenstions, like adding of different cryptography support or the step to android