Finished everything related to the new structure