Move code in separate folder