Changed directory structure again. also added config to app