Refactored lib to src