Develop

Major clean-up and fixed missing file errors. Hopefully it works.