Changes for Hackage
Move constructors to new file