Restructuring files and adding some more