moved files around finally

working towards a more stable state