Reorganized project so it will be easier to add test and demos in the future.