Made some modifications in structure to low down the number of files