add term layout
refactor and layout
re add moved files
change partials path