Moved shapes to its own module