Added a Shape folder

Added a Shape folder and moved over the shape classes