move code for initial/terminal objects to correct modules