reorganized the folder structure for better nav