Created some more controllers, renamed folders to match schema