Package strucuture refactoring
Merge remote-tracking branch 'choose_remote_name/master'