Restructure project, added less