Integrated the network module and changed the folder structure