Moved source files for maven compatibility