Moved files in hierarchy (Java classes are now in root)