Final version

Done release version
Done file refactoring