Organized the files a bit better