Moved shape functions into own folder