Changed file structure
Minor changes