cleanup folder/link spaghetti