update to new folder structure, remove old folders that I never used