Some bug fixes. Tested directory naming changes on device and made corrections.