re-organizing the folder structure