some refactoring of file structure and css