cleaned up root and folderized this project