remove duplicate directories; redo app structure