Moved structure around slightly to separtae app from specs