restructuring package folders