Refactor the way we have our CSS organized