reorganization of sources
some changes