Moved files to work better with ino tool