changed directory names to make more sense in the app structure