Rearranged filesystem (slightly)