fixed conflicts
added a Model module for Sequencer Models, also changed some naming conventions