Major reorg of files after beeswax addition