reorganized folders a bit more