Moved the entity to a seperate package
Added JavaDocs to most classes