Fix few structure problems

Now app starts.