Split controllers and factories

Also standardized file names