Restructure project to be a bit more ready for community