Updated file structure and included licence