cleaned up folder structure for repository cleanliness