Restructure App in more modular way containing enviroments