Added callbacks ; Changed directory structure for easy install.