Move code in right files following guide lines