Moves routines down into the abstract directory.
Ready for metadata flow.