removed forms from model
refactoring directory structure