Moved all the code to the proper maven-style source folders