Re-adding needed files

Because we need profile support. Better to add them back and selectively delete
the ones we don't need later.