Clean up/Couple of changes

I made a couple of simple changes to Botnak you should do. Probably don't want to pull this because you have done alot of changes since but just a idea.

These changes allow you easy import the project with maven the pom.xml. You can also do mvn clean package and get a working jar.
I also moved the folders around the folders so it is more to basically standards.