changed file structure and updated links