Reorganized app file tree, added test modal