Merged files into one and added Cmd module for better command line support