Made Static
Changed Engine Location
Moved Classes
Fixed JavaDocs