Created library
Cleaned up project structure
Refactoring complete
Merged branches
Merged