Change folder structure for less (2nd draft)