simplified instance declarations
reorg of files