changes to main files structure