Final merge, added scripts files