Moved library to 'src' directory
Added type signatures for composition diagrams