A few Changes, bugfixes and directory layout changes

Bugfixes and refactoring
Make resources conformant to maven standards