restructured file layout