Style dir structure reorg