Insert some classes for items and structuring
Some small changes. To Do: Javadoc annotations.