Some refractoring of files done