modified moduse structure, added test of imports and changed documentation accordingly as some import statements have changed as a result