Slight style tweak and renamed script files for easier folder/file structure.