changed file names and structure in /ui/inc