refactored model organization and added initial versions of linear normal