move files around
fix template paths for new directory structure