Minor refactoring, file naming and layout changes