Moved some stuff around. Changed the makefiles to force source files to include ui header files using 'ui/<header>'.