removed sample model from core, renamed modules