Merge branch 'structure'

removes dependency on an IDE