Fixed whitespace in pom.xml
Massive code restructuring