revamp sass structure + fix includes