re-structured application