Some minor changes and FOLDERS! :D 
Yep, it's almost 1 AM. I just didn't want to sleep :)