reorg file structure -- cleaned up