Refactored stdlib
Merged refactor