Restructuring the code and adding zgamma analyzer