Restructed files again
Added tags controller. Scoped controller funcs into objs to ensure correct controller funcs are called