Added javadoc errywhere. And a start of the entity structure