Start implementing Restaurant.java, clean up other files