Step 5 and 6:  Add Data files and Controllers