Consolidate everything into single file