Re-named class folder for easy nav