Restructure 2: Electric Boogaloo

Moving the pubspec files around to make the code all legit.