More UI stuff, started to organize files into folders.