Separate ui libs from source. Begin sonar cleanup.