Refactored libs into project folder