Organization Update

+ updated project organization
+ added some JavaDoc
+ code beautified