folder cleanup

and related path changes