added collections
added collections and merged wip
added factory
deleted hello tmpl