Cleaned up folders, removed duplicates