Separate CLI into different file