Feature/etd personal folder refactor

Fixes #303 

Also, just a general re-naming and refactoring