1.0.1 beta version, code reorganization