Reboot!
Re-organizes app (work in progress)