restructure
Merge branch 'parse_input' into dev