Moved includes and src to project root