Ignoring build folder
Removing old build folder
Merge with branch refactor
Renaming controllers
Fixing references