App isn't currently modular, so make directory structure a little flatter