restructuring application

Client not completed