modified folder structure to demo like