Changed file structure for command line builds