Updates folder structure and imports