Renamed some source folders & organized java classes

cleaned up the mess a bit