Restructure + add sass