complete restructuration, included only ui project