Changed folder structure for api classes