Reworked structure off app a bit