Cleanup

Clean out outdated files and structure