Minor refactoring and directory structure changes