Split abstractions into a couple more files.