Bug fixes from all previous google code issues and corrected module structure in line with proper setup script.