Some refactoring and folder-renaming to clean things up