Move code to subfolders. Fix an error in engine