Restructuring & finalizing // Testing