Restructure app and get basic list and detail view working