Changed logic for styles - rename and split files