Some restructing and renaming of files
Added info