more sass structure, add some old stuff