Separate cli and gtk sources into separate directories