Moved each java class to its own folder