reorganized layout files