Move api classes to otehr package