Several changes and creation of new files