Re-organized folders and got to ch. 6 of BNR iOS