organize files, refactor shapes data type, add nudge function to shapes.hs