Finalize architectural refactoring & delete obsolete files