cleanup
changes folder structure