project layout cleanup
reactivated remote test suite
debug id gerneration