Moved some stuff into the correct package and added maybe test cases for initialization check.