Re Jig of less files to allow inheritance