changed up the file structure/etc