CLI and files structure changes

Hey!