clean up constructors, move exercises into a folder