Moving libraries into main build file