Organized java files in folders so it won't look cluttered. Also,
started fixing code a bit