folder reorg; cleanup usings
copyrights