Restructured files, added a bit of code, not currently working but will get back up and running soon