Restructuring the folder

'nuff said.