refactor whole project by rebuilding the folder structure