disutils: change app layout. Break functions out into files