- switch for interactive mode
- cleaned up folder structure