Use new layout, move main.css to sass dir