Rearranging structure of app and fixing environment paths.