Restructuring of Library and Application to build a Testing Project