lots of changes from project reorg. added conguration tab