code cleanup, renamed package structure to better reflect the project
Merge remote-tracking branch 'upstream/master'