last of the ambigious commits
fix up files after move to assets/