moved some stuff to flatten directory structure