Theme folders reorganization