app organisation improved