Modernized project structure. Updated reload methods on data source to get around insert nil bug