Refactoring script, adding new libs, etc..