Restructure project, simple UI working