Restructured the files and got networking