Reorganized libs project structure