file reorg, bugfixes