Refactor Controller and Factorys

Split Scope and Methods