Fixed an inconsitency with file names and reorganized the folders into the file names for clarity.
Added time to verbose output.