[Misc] revised folder structure