reorg. imp. cleanup code and commit  own classes