small changes, folder cleanup