Folder and Data cleanup

Cleaned up unused folders and data.