Fixed the single digit ID bug
renamed folders and merged