Class structure

New classes according to the design of the mapping
Ignoring .classpath file

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	.gitignore