Refactored more packaging
Removed incomplete javadocs in some classes