Removing temporary code
Adding modules
Removing log4j2.xml
Moving packages to appropriate modules
Adding dependencies