Re-structured the files and added controllers