completed test app restructuring