Code Rewrite part 1

Removed .java files.