shift assets into subdir
fix undefined variables