Helpers: Added mac generator;
Lib: Move things, clean up stuff...