Latest Code Commit. Restructure Controllers