reorder js and css sourcing to be more readable