Cleaned up unused files and renamed things