refactor css classes and file structure