Change file structure to run CLI in seperate file