Better organization of less files