Reorganized files and minor bug fixes. Also moved images to .xcassets system