Changed files structure
Changed config & files structure