folder changes

ing folder change, cleanup code