minor stylistic changes, moved folders to sensible locations