Moved files and fixed minor issues