rework folder structure for repo