modified api structure, clear & library