More logical arrangement of files