Updated css and refactored dirs