refacto(app): change lot of concepts