Updated files and structure