Reorganize & Scene Switch

Clean up folders and code to match path changes. Attempt #2 at
combining code & assets