(fix) Put controllers in separate files