renamed folders and fixes bug