Move code into src