Cleaned up include structure and working on demos