Restructuring Project so Unity doesn't yell at me