Renamed Files/Classes, removed unused imports

Please remove unused imports on your own and make at least javadoc comments