Rebooted

changed names, refactored parts, link updated