Moved files to correct main/java folder