Updated folders.
Updated folders.
Updated source folders and organized classes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath