trying to clean up folder structure a bit