Organized some files