API libraries improvements, easier prefixing to folders, some refactoring