Files organization

Re-organization of the files