Organize the files a bit better