Cleanup and file-consolidation