Refactoring: Moved shapes into own package