restructured file layout and renamed paths