Restructuring files
Adding new file structure