add typing, move to haml
add missed files