Added refresh, changed folder hierarchy