modules restructure, rename, pep8 formatting