Move code to src folder (part 2)