Cleaned up project structure and added controllers