clean up the folder structure a bit more