Correct hours file format, organize directories