Heavy makeup on file structure, clean and update with current best practices too. Thanks to @inuitcss for greak tips