Minor file structure updates