Removing 'main.js' naming for flexibility in future. Also adding Controller at the end of controllers for better file searching