Moved previous API modules into a base package