Rename application package, lots of refactoring. #160 fix