Fixed bugs, changed names and updated structure.