Moved Libraries into solution

Moved Libraries into solution