integrate first tests, restructure stuff