CHANGE architecture to 'cli builder' (first draft)