Updated files structure