Basic files & a little cleanup