Split the command builder and constants from the main file