restructuring file layout