Restructered a bit and added app.go