Organise files a little bit