Moved Dependencies into Lib