Organise files a bit better