Folder reorg and add class bullcrap