Restructured files and ran a couple of versions - looking much better