Moved classes to API folder