Moved types into matching files. Added contact repository and contact instance