Restructured app layout, moved app to collection_record package