Reorganized app from a sock-drawer style to modular.