Cleaned up API package