added folders, removed old code