Refactor: rename and combine css files together