Major reorg of files after beeswax addition
Merge pull request #15 from laserson/beeswax

Major reorg of files after beeswax addition