Fully reconfigured the project. Cleaned up.