refactoring
add models, seperate partials, new index