Moved namespace up the src dir