Major cleanup + placeholder for hibernate files